Backport gh-1693 to maintenance/0.17.x branch #1694
+34
−10
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.